bitkeeper revision 1.1159.1.497 (41c85fb6Idmg_bfo7zG528C4ntiZkw)
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Tue, 21 Dec 2004 17:39:02 +0000 (17:39 +0000)
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Tue, 21 Dec 2004 17:39:02 +0000 (17:39 +0000)
Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk


Trivial merge